Autogenerated HTML docs for v1.7.6-401-g6a319
diff --git a/gitattributes.html b/gitattributes.html index fe9bd81..fca248c 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -497,7 +497,7 @@ Attributes for all users on a system should be placed in the <tt>$(prefix)/etc/gitattributes</tt> file.</p></div> <div class="paragraph"><p>Sometimes you would need to override an setting of an attribute -for a path to <tt>unspecified</tt> state. This can be done by listing +for a path to <tt>Unspecified</tt> state. This can be done by listing the name of the attribute prefixed with an exclamation point <tt>!</tt>.</p></div> </div> <h2 id="_effects">EFFECTS</h2> @@ -1307,7 +1307,7 @@ <tt>gui.encoding</tt> configuration variable is used instead (See <a href="git-config.html">git-config(1)</a>).</p></div> </div> -<h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2> +<h2 id="_using_macro_attributes">USING MACRO ATTRIBUTES</h2> <div class="sectionbody"> <div class="paragraph"><p>You do not want any end-of-line conversions applied to, nor textual diffs produced for, any binary file you track. You would need to specify e.g.</p></div> @@ -1316,21 +1316,24 @@ <pre><tt>*.jpg -text -diff</tt></pre> </div></div> <div class="paragraph"><p>but that may become cumbersome, when you have many attributes. Using -attribute macros, you can specify groups of attributes set or unset at -the same time. The system knows a built-in attribute macro, <tt>binary</tt>:</p></div> +macro attributes, you can define an attribute that, when set, also +sets or unsets a number of other attributes at the same time. The +system knows a built-in macro attribute, <tt>binary</tt>:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>*.jpg binary</tt></pre> </div></div> -<div class="paragraph"><p>which is equivalent to the above. Note that the attribute macros can only -be "Set" (see the above example that sets "binary" macro as if it were an -ordinary attribute --- setting it in turn unsets "text" and "diff").</p></div> +<div class="paragraph"><p>Setting the "binary" attribute also unsets the "text" and "diff" +attributes as above. Note that macro attributes can only be "Set", +though setting one might have the effect of setting or unsetting other +attributes or even returning other attributes to the "Unspecified" +state.</p></div> </div> -<h2 id="_defining_attribute_macros">DEFINING ATTRIBUTE MACROS</h2> +<h2 id="_defining_macro_attributes">DEFINING MACRO ATTRIBUTES</h2> <div class="sectionbody"> -<div class="paragraph"><p>Custom attribute macros can be defined only in the <tt>.gitattributes</tt> file -at the toplevel (i.e. not in any subdirectory). The built-in attribute -macro "binary" is equivalent to:</p></div> +<div class="paragraph"><p>Custom macro attributes can be defined only in the <tt>.gitattributes</tt> +file at the toplevel (i.e. not in any subdirectory). The built-in +macro attribute "binary" is equivalent to:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>[attr]binary -diff -text</tt></pre> @@ -1398,7 +1401,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2011-05-25 23:59:09 UTC +Last updated 2011-08-04 00:21:28 UTC </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index 412c55b..2bbe76b 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -79,7 +79,7 @@ `$(prefix)/etc/gitattributes` file. Sometimes you would need to override an setting of an attribute -for a path to `unspecified` state. This can be done by listing +for a path to `Unspecified` state. This can be done by listing the name of the attribute prefixed with an exclamation point `!`. @@ -868,7 +868,7 @@ (See linkgit:git-config[1]). -USING ATTRIBUTE MACROS +USING MACRO ATTRIBUTES ---------------------- You do not want any end-of-line conversions applied to, nor textual diffs @@ -879,24 +879,27 @@ ------------ but that may become cumbersome, when you have many attributes. Using -attribute macros, you can specify groups of attributes set or unset at -the same time. The system knows a built-in attribute macro, `binary`: +macro attributes, you can define an attribute that, when set, also +sets or unsets a number of other attributes at the same time. The +system knows a built-in macro attribute, `binary`: ------------ *.jpg binary ------------ -which is equivalent to the above. Note that the attribute macros can only -be "Set" (see the above example that sets "binary" macro as if it were an -ordinary attribute --- setting it in turn unsets "text" and "diff"). +Setting the "binary" attribute also unsets the "text" and "diff" +attributes as above. Note that macro attributes can only be "Set", +though setting one might have the effect of setting or unsetting other +attributes or even returning other attributes to the "Unspecified" +state. -DEFINING ATTRIBUTE MACROS +DEFINING MACRO ATTRIBUTES ------------------------- -Custom attribute macros can be defined only in the `.gitattributes` file -at the toplevel (i.e. not in any subdirectory). The built-in attribute -macro "binary" is equivalent to: +Custom macro attributes can be defined only in the `.gitattributes` +file at the toplevel (i.e. not in any subdirectory). The built-in +macro attribute "binary" is equivalent to: ------------ [attr]binary -diff -text
diff --git a/technical/api-builtin.html b/technical/api-builtin.html index 0fbbd8a..2781da9 100644 --- a/technical/api-builtin.html +++ b/technical/api-builtin.html
@@ -472,6 +472,11 @@ Add an entry for <tt>git-foo</tt> to <tt>command-list.txt</tt>. </p> </li> +<li> +<p> +Add an entry for <tt>/git-foo</tt> to <tt>.gitignore</tt>. +</p> +</li> </ol></div> </div> <h2 id="_how_a_built_in_is_called">How a built-in is called</h2> @@ -490,7 +495,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2009-04-28 09:29:23 UTC +Last updated 2011-08-04 00:21:28 UTC </div> </div> </body>
diff --git a/technical/api-builtin.txt b/technical/api-builtin.txt index 5cb2b05..b0cafe8 100644 --- a/technical/api-builtin.txt +++ b/technical/api-builtin.txt
@@ -49,6 +49,8 @@ . Add an entry for `git-foo` to `command-list.txt`. +. Add an entry for `/git-foo` to `.gitignore`. + How a built-in is called ------------------------
